Merge.
authorSteven Smith <ssmith@xensource.com>
Fri, 29 Sep 2006 13:42:49 +0000 (14:42 +0100)
committerSteven Smith <ssmith@xensource.com>
Fri, 29 Sep 2006 13:42:49 +0000 (14:42 +0100)

Trivial merge